luci-app-*: migrate LogreadBox consumers to use new permission ACLs

		"ubus": {
			"log": [ "read" ]
		}

Signed-off-by: Paul Donald <[email protected]>

diff --git a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
index 4eacfae1bfb099e0023beafc4552f14247519324..dde437411ab365f4ef5c11f5e36116f008efb1d5 100644 (file)
--- a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
+++ b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
@@ -1,20 +1,21 @@
 {
-        "luci-app-acme": {
-                "description": "Grant UCI access for luci-app-acme",
-                "read": {
-                        "cgi-io": [ "exec" ],
-                        "file": {
-                                "/usr/lib/acme/client/dnsapi": [ "list" ],
-                                "/proc/sys/kernel/hostname": [ "read" ],
-                                "/etc/ssl/acme": [ "list" ],
-                                "/usr/libexec/acmesh-dnsinfo.sh": [ "exec" ],
-                                "/sbin/logread -e acme": [ "exec" ],
-                                "/usr/sbin/logread -e acme": [ "exec" ]
-                        },
-                        "uci": [ "acme", "ddns" ]
-                },
-                "write": {
-                        "uci": [ "acme" ]
-                }
-        }
+       "luci-app-acme": {
+               "description": "Grant UCI access for luci-app-acme",
+               "read": {
+                       "cgi-io": [ "exec" ],
+                       "file": {
+                               "/usr/lib/acme/client/dnsapi": [ "list" ],
+                               "/proc/sys/kernel/hostname": [ "read" ],
+                               "/etc/ssl/acme": [ "list" ],
+                               "/usr/libexec/acmesh-dnsinfo.sh": [ "exec" ],
+                       },
+                       "uci": [ "acme", "ddns" ],
+                       "ubus": {
+                               "log": [ "read" ]
+                       }
+               },
+               "write": {
+                       "uci": [ "acme" ]
+               }
+       }
 }

diff --git a/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json b/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
index 5fc914d3e76756d77a3d45eeda68011a17113199..b0be56557187c47df3fda39f02d22935128915a5 100644 (file)
--- a/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
+++ b/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
@@ -33,12 +33,6 @@
                                "/var/run/adb_runtime.json": [
                                        "read"
                                ],
-                               "/sbin/logread -e adblock-": [
-                                       "exec"
-                               ],
-                               "/usr/sbin/logread -e adblock-": [
-                                       "exec"
-                               ],
                                "/etc/init.d/adblock reload": [
                                        "exec"
                                ],
@@ -61,6 +55,9 @@
                                        "exec"
                                ]
                        },
+                       "ubus": {
+                               "log": [ "read" ]
+                       },
                        "uci": [
                                "adblock"
                        ]

diff --git a/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json b/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json
index ffff57aeea18e8c7efaf651488449793dbc0586f..b5884a6fb773b634b9e5180edcd75ce004f85f0e 100644 (file)
--- a/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json
+++ b/applications/luci-app-banip/root/usr/share/rpcd/acl.d/luci-app-banip.json
@@ -30,18 +30,6 @@
                                "/var/run/banip.lock": [
                                        "read"
                                ],
-                               "/sbin/logread -e banIP-": [
-                                       "exec"
-                               ],
-                               "/usr/sbin/logread -e banIP-": [
-                                       "exec"
-                               ],
-                               "/sbin/logread -e  banIP/": [
-                                       "exec"
-                               ],
-                               "/usr/sbin/logread -e  banIP/": [
-                                       "exec"
-                               ],
                                "/usr/sbin/nft -tj list sets": [
                                        "exec"
                                ],
@@ -70,6 +58,9 @@
                                        "exec"
                                ]
                        },
+                       "ubus": {
+                               "log": [ "read" ]
+                       },
                        "uci": [
                                "banip"
                        ]

diff --git a/applications/luci-app-clamav/root/usr/share/rpcd/acl.d/luci-app-clamav.json b/applications/luci-app-clamav/root/usr/share/rpcd/acl.d/luci-app-clamav.json
index 06529a01f369df6ab1628e02d278264a9d4bb70c..26f2c0b4f8b95ae37371bbb85b90a2292b5047d3 100644 (file)
--- a/applications/luci-app-clamav/root/usr/share/rpcd/acl.d/luci-app-clamav.json
+++ b/applications/luci-app-clamav/root/usr/share/rpcd/acl.d/luci-app-clamav.json
@@ -3,15 +3,16 @@
                "description": "Grant UCI access for luci-app-clamav",
                "read": {
                        "file": [ "/tmp/*" ],
+                       "ubus": {
+                               "log": [ "read" ]
+                       },
                        "uci": [ "clamav", "clamav-milter", "freshclam" ]
                },
                "write": {
                        "file": {
                                "/etc/init.d/clamav *": [ "exec" ],
                                "/etc/init.d/clamav-milter *": [ "exec" ],
-                               "/etc/init.d/freshclam *": [ "exec" ],
-                               "/sbin/logread -e clamav": [ "exec" ],
-                               "/usr/sbin/logread -e clamav": [ "exec" ]
+                               "/etc/init.d/freshclam *": [ "exec" ]
                        },
                        "uci": [ "clamav", "clamav-milter", "freshclam" ]
                }

diff --git a/applications/luci-app-nextdns/root/usr/share/rpcd/acl.d/luci-app-nextdns.json b/applications/luci-app-nextdns/root/usr/share/rpcd/acl.d/luci-app-nextdns.json
index f6425519a05b6f021218dec186178bfa67c834e6..035d0db0d76c35f325d1795972d35b0f1914af23 100644 (file)
--- a/applications/luci-app-nextdns/root/usr/share/rpcd/acl.d/luci-app-nextdns.json
+++ b/applications/luci-app-nextdns/root/usr/share/rpcd/acl.d/luci-app-nextdns.json
@@ -2,8 +2,8 @@
        "luci-app-nextdns": {
                "description": "Grant logread access to LuCI app nextdns",
                "read": {
-                       "file": {
-                               "/sbin/logread": [ "exec" ]
+                       "ubus": {
+                               "log": [ "read" ]
                        },
                        "uci": [ "nextdns" ]
                },

diff --git a/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json b/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
index 35fe60aeb990fa1ce15400a43282ddb807430b2a..c15c0b8f399a9ee224a41747b21b3726e35d87fa 100644 (file)
--- a/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
+++ b/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
@@ -15,14 +15,15 @@
                                "/var/run/travelmate.scan": [ "read" ],
                                "/var/state/travelmate.refresh": [ "read" ],
                                "/tmp/trm_runtime.json": [ "read" ],
-                               "/sbin/logread -e trm-": [ "exec" ],
-                               "/usr/sbin/logread -e trm-": [ "exec" ],
                                "/sbin/ifup *": [ "exec" ],
                                "/etc/init.d/travelmate start" : [ "exec" ],
                                "/etc/init.d/travelmate stop" : [ "exec" ],
                                "/etc/init.d/travelmate setup [0-9a-z_]* [0-9a-z_]* [0-9]*" : [ "exec" ],
                                "/etc/init.d/travelmate scan radio[0-1]" : [ "exec" ]
                        },
+                       "ubus": {
+                               "log": [ "read" ]
+                       },
                        "uci": [ "travelmate", "wireless" ]
                }
        }